Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Mon, 26 Feb 2007 14:48:46 +0000 (14:48 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Mon, 26 Feb 2007 14:48:46 +0000 (14:48 +0000)

Trivial merge